From: Joakim Verona <joakim@verona.se>
Date: Tue, 20 Aug 2013 10:16:47 +0000 (+0200)
Subject: merge from trunk
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=dd9b511aa5fc7194cec86398548f9e2afa0e435e;p=emacs.git

merge from trunk
---

dd9b511aa5fc7194cec86398548f9e2afa0e435e